Fix DS and NS add in different order