fixed bugs introduced in PropertySet->PropertySetB refactoring