issue #22 fixed stupid bug