improving issue #29