Update for 1.6.1 (I think...)