ou/o- and ii/i- bugs fixed