fix false messages are fired when there is lag