issue #20 - changed sending events