bug fix - flicker