Merged with ui upstream
Tiny fix