correct drop handling