closed issue #25