Collection emit change fix