This change makes drag and drop as smooth as before (hopefully)