Fixed the same intent related issue.