Fixed if Statements