Fixing Drops again
Merge origin/master