Trying to fix broken controls