Fixing a bug regarding the property bag refactor