fixed #110 fixed #29