Fixed if/else