Attempt to fix flickering