Fix issue #2221