Correction in logic for @9606a603bb