Yet another attempt to fix the location of Demo.?pp.