Fixed CDC setup bug