Fixed issue with setting header up before setup data is returned