Potentially fix an issue with property values not loading