Fix for crash with tab_container