Fix issue #2083