Fix parallel execution