Merged nbfake fix