Issue #2: fix headers