Fixing accidental early exit