solve issue #3