Upgrade to the 1.8.0 api