-Fixed variable related issue.