A bit more thorough checking