IOMAP Fix for instability