Gamepad hotfix

This is just a small hotfix to gamepad issues that started last week.