issue #2134