Fixed CC annotated boundaries