Fixed dropping bugs.