fixed #01 fixed #02