Improve the copy a bit