solve issue #12