Fix for touch events and drag method