Rather than testing the length of the id, check that it hasn't changed