Fix problem with headers