188 Fixed if statements