Fix premature return