Drop fix

Yet another drop=FALSE fix...
+ Test