Bug fix header splitting logic