fix #57, fix #62