Fix issue #2139