final fix for demo