UI: make it work with altered API