Fixed bug with behaviour on tab update