BoT-Concern fix for issue 1835 redux