impl. issue #103