Fix QS construction