Changes made for fixing RRD issue.