Fix issue #2030