Fix issue #2230