Quick hack to fix drag and drop