Possible fix for header issue