closed issue #12