fixed the double drop issue