Fixed DSA failure cases