Changed PreserveReferencesHandling

Fixes #553