MANTA-17 Fixing fwd/backward reference bug