Fix If Statements