Fixed issue with tabs