Fixed #823