Upgrade to Om 0.6.0