Fix issue #2220