Update for 1.7 compatibility