Fix issue #2193