Fixed #825