Fixing a problem with scanning. All headers are picked
up now.