Update for 1.9