Fix issue #2200