Working toward fixing #2741