Solve DS Issue