Fixed flickering in 3.2.0