Phase #1 Fix For DT2W