Bug fix for tab content issue