Bugfix: prevent flickering