Fixed the issues with propertyCount