fix per discussion dab7a67eb007952ebf6d8b4e4da2aebe099b04ef