Revert "Revert "fix multiple drags""

This reverts commit 5481403833b33e1a91a36602f1c40f48843c7f82.