resolving issue #12