Controls fix