@mmajewsk - really sorry for this - but here's the final fix (I think). We do need this fix for Lovell to run.