Issue16 modifying according to the Miyasaka san's comment