Fix issue #2267