Fixed: Was creating too many listeners (Jacek Pulut)
6 files changed