Fixing an issue with tabs