Fixing while issue.