Work on KAMI fix.