Fix Bug - Final Demo