Fixing Noah BP