Fixes tab issues