Fixed #868