Fixed #1128