Checks for the drop property
Merge pull request #1774 from DaNiwa/drop_fix

Fix #1759