Actually fixed the flickering bug