Fix issue #2094