Removed potential false drop/dupe bug