Fix flicker

Flicker fix PR, now with less random commits :-p