Perhaps the last fix for the nhist test.