issue #94 solved