Fixing property copying