resolves #3891
Co-authored-by: Matthew Fisher <matt.fisher@microsoft.com>