First try at fixing dragging