Fixed dragging and dropping even more