Fix the string tabs

Fix the error ArgumentOutOfRangeException reported by @fprochazka, @matej21. Thanks

Fix the error on merge

Fix the wrong commit made due to error in brase