issue #21 fixed