Fix bug for QA review