Remembers tab position now
merge fix