fixed #27 fixed #72