Fix drop handler