Fixed #835