Another demo fix