issue #63 fix