for issue 440 - reverting to old code as the fix is done in PropertyName