DCT-26 #resolve trying to resolve again