MANTA-45 proposed fix