added missing listener and cleaning the receivers