cherry-pix fixes #2