Re-fix after merge of other demo fix