KeyInfo factory service fix