Fix drop bug... Some optimize...