Fix to made modal+nav_tab working