Fixed blinking on items change