fix copy issues on 2.x