fix my TDQ-2 bug on test/bugfix/TDQ-2 branch