Fix for ui.routes