issue #710 fix