Fixed #826