fixed else stupidness