Bagel Love Story: Fix the Controller/Keyboard Issue

Fix the Controller/Keyboard Issue