Resolves tab issue described in bug #246