fix bug for QA review