fix extranious else