issue #100 fixed