Fix issue #2050