Tobias Weihmann Integrating Patrick's display glitch fix