fix #62 & #58