Further fixing (CakePHP's API changed..)