[Evgeny, Jason] Fixed Connector bug that caused circular events loop, related to #25