Update tab length and fixed location error