Fixed drag&drop issue