Fix issue #2038