After some more stringent testing it turns out the above method isn't working for all, Germany seems to work ok but UK and France are out by one, will have to investigate further