Improve copy a little bit