more qs fixing ..