Upgraded to v2.0.5