Make manual dropping follow the same logic as periodic drop