Fixed #877