Another tweak for bug #7687.
This fixes #7690.  The properties are now getting set correctly.