Automation UI Fix