Fixed bug with header splitting