Fixed issue #3008