closed issue #24