fixes by Makoto Nozaki