SPLIN-1454 Fix the comparision issues.