development bugfix from Hasegawa-san