Fix drop bug