Upgrade to 0.6.4