Further change to replace ucurv by udct