Upgraded to 3.0.4.Final