Fix drag issue