Fixed the issue #DE11320