Fixed to work better with controllers.