fix back ported from main branch