Fix double dropping content

Fixes #449