fixing condition load