properly handle keys that have a comment in the headers