Some bug fixed

Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>