fixed #97 fixed #98