conditions bugfix