UI / automation fix