Fixed bug with dragging/clicking