[dp][xs]: fix up incorrect layout.