Fixed Bypass Threshold issue