MANTA-70 theoretical fix for missing inversion
MANTA-70 a few more fixes to get this working