Update for 1.9.6