Partly fixed #97