Maintain compatibility with very old cstruct