Fix flickering