Changed as can be trapped 'skip_all' in the 'intercept' function.