Fix if/else setup