Fixes CC-597

Can you wrap a unit test around this with some example headers?