Glitch fixed for drag and drop