Re #7327 Fix property handling