Upgraded to 3.8.1.Final