issue #13 fixed