Fixing premature return.