Fixed the external listeners problem