From Eldskegg: Fix in Game and Controller