issue #35 fixed