issue #47 fix