bugfix condition