Upgrade to CakePHP 2.3.3