Fix a Bug and Improve QA.