fix drag and drop watchers 2