Fixed defect with headers not being cloned