Fixed problems with copy