impl. issue #96