FLEX-34101 likley fix for regression issue