Fixed broken value spliting for  and  operators