Fix the escalated issu:wq