issue #15 fixed