Fixed #1101