Fix bug with destructive modification of properties