Quick fix of a new bug in tabs management