Fixed soft tab issues