Upgrade to 3.0.6