SWC-655: rework
fix listeners