Make Property copying safer #522