Applying fix suggested by rshan2 to prevent dual-use properties being counted multiple times