Fixing bug with drop logic.
Merge pull request #924 from MarcinSc/develop

Fixing bug with drop logic.