Cake 2.5 compatibility fix