Fixed overshift guard to be correct and more readable than
what was added in 3cf115b90975855323fb64bb492daaefc7fcb36f