Fixed issues with D&S