fix conditins