More correct fix for 8bfbef4: the check was already there; just needed to set the...