Updated to work with 1.6.2

Should fix things to work with 1.6.2.