closed issue #28