QS: bugfix part 2