Fix for PropertiesForOptimization