This is something @neil and @j.jaffeux looked at in detail today but deemed unfixable without major engineering time.