issue #107 fixed