closed issue #29