solve issue #6