Super hacky fix to drag and drop