Fixed bug with events ZEN-9318