addresses #363 - temporary fix, but this will require more thought later...

..., as custom headers require a subclass