Fixed #807