Fixing issue with tabs