Fix QS

Change-Id: I7157e18c804da571fd182a34ebe07a1d3b4f1682