solve issue #82