Make Y consistent like with D