Fixed multi-header issue