Upgrade to Thorax  2.0.0rc4