Fix issue #2291