Fix tab behaviour
merged