issue #17 fixed