Fixed drop bugs