And fix for header remote sources as well...