issue #28 fix