TZ demo fix