Fixed for else/else-if