#687 - resolved issue by changing event listeners order