Fixed #1173