fix multiple drop bugs