Fixed issue #2299