fixed #30 fixed #29