Fixes c.c handling