closed issue #23