fixed issue reported by QA