closed issue #16