issue #6 fixed