closed issue #31