Temp plugin fix too - this needs reworking