Includes the fix mentioned in earlier commit...