Fix for drag and drop