fix is null