Possible bugfix to CCD