issue #51 fix