have correct tab behaviour now