removed null comparision