Version 17.4: Reduces flicker