Fix the caveat expr limit to be processed by our code

Fix the caveat expr limit to be processed by our code #5663