more support for lack of headers
0.6.0