Fix underscores issue.