Update for 1.2 compatibility