work on #533 for Drag