Quick bug-fix for drag & drop