fix next conditional