Fixed a bug.
Added the demo patch for system configurations.