Fix on schema update
Merged with ui upstream