Correcting Branch 1.6