Fix refactoring issue. Store actual values in the properties.