Fix this issue #1122