Upgrade to formatter 2.0