Fixed #879