Fixing boundary condition race sync issues