completely fix #62