Issue #257: Fix headers with underscores.