Added a fix for the system plugin demo.