Created workaround for bug in tab class branching