Fixed #822