if/else fixed