Fix IF Statements