#915 Fixing bugs related to dragdrop