Small tweak to support empty PropertyValues