impl. issue #88