Get a bit less clever with headers