Merge "fix the mix use of errorperbit and sadperbit"