removing null check