Fix issue #29