Cherries 312 issue

Cherries 312 issue