Use more bulletproof start of range detection