Fix c4 to be compatible with branching