issue #27 fixed