Cherries 243 issue

Cherries 243 issue