solve issue #5