Fixes the trailing header issue