Completed fixing CTD