16 fix PropertyManager