Fixup (C) - we've both worked lots on this :-).