Fixed else/elseif conditionals