Better drop handling