Bugfix for demo app's infinite display