Repaired 1.7.0