fixed expression fn from while to if