Of course it's a bodge, and my notes would recommend rewiring the circuit, but it's a bodge that makes the installation satisfactory. We can't make up coding to suit what we'd recommend the installation to be.Changing the fittings is a bodge solution