Fix property class definition/calculation.