Fix for duplicate tabs