Fix ForkJoin