WIP: fix for drag