impl. issue #97