Somehow there is a bug. Might be an internal OPropertySet problem as I
can't find it in my new code.

Change-Id: I6658fa82f4158ef114baf80b8d9ed9ec44793d35