Fix the early exit; remove it