Bug fix for parallel