Made demo app work again