Fixed format bug for 2.6 (again).