Fix properties to use copy in the correct way