impl. issue #72