Upgraded to 1.9.7