make it work with new format headers (no ... remote from... lines);