Try to fix header issue