I think this fixes RT #122028