fixed https://github.com/MetaModels/core/issues/681
Merge pull request #688 from cboelter/fix/condition-handling-event-listeners

Fixed the condition-handling