Fix the issue #1051