fixed #87 fixed #86