fixed dsa/dsq restriction issue