Empty collection change fix