fix headers feature to support all send signatures