Fixed else if