finally, fixed #62