I2P related fix