Updated with UI-mods bugfix