Eliminated warnings introduced bug in parallel case