TASQ-1;TASQ-16: Fixed bugs