Changed where check for preserveValue is