null check changed