Fix return before else