PropertyOverrideProvider bug fix