fix drag and drop bugginess