pod fix from rt#93907