Fix bug with drag&drop