Minor bug fix to support DR in demo mode