First level fix for Tab Size issue