*8707* Fixed error in tab handling