See new commit, maybe we also could remove the copy-suffix then?