Fixed creation of listeners to collect stats
Fixed merge conflict