Re: #90, #68 - Altered attribute copying logic