Fixed errors found by Watabe-san