Fixed elseif and return