Fix issue #2111