Fixed #942