fixed #52 fixed #51