GPII-941: failed attempt to fix the event/listener issue.. committing for antranig to look at