I realise this isn’t any help to anyone but my problem seemed to have fixed itself. I only tried what I’ve said above and the only other thing I can think of is that I fixed it before and some sort of caching issue was effecting it.
Sorry I can’t be much more help.
