Quick fix to help maintenance of demo systems