issue #36 fixed