Latest if else bug solved