Bug fix: removed double mouse/touch events handler