BI-322
Fix listeners