cake issue 4 095

Cake issue 4 095