解决issue#82