Fix for the demo app