Fixed issue #3073