Check CMA03-3 (plus tiny fix in CMA03-2)