fix to issue #2036