Fix issue #2179