Fix datum handling of underscores