[#0] fix optionalValuedMap