Modify by Ko Zaw Myo Htet IssueNo.123