Demo app fix