final fix for the demo