fixed #53 fixed #60