issue #26 fixed