Fixing drop bug