バグfix #2
rewrite