Bug fix: using mousemove event