Fixed issue #3000