This should now be fixed on the whole PR now that I've fixed my rebase mistake.