Upgraded to 1.2.5