Removing a premature return