Merged Tal's nbfake fix to v1.60