Bug fix for cancel, dragging supported