QS: bugfix part 1