Improved catching of drag handles, closes #35