fix copy issues