diff --git a/boot.lua b/boot.lua
index e384e2ce..e95ab235 100644
--- a/boot.lua
+++ b/boot.lua
@@ -4,7 +4,7 @@
 		_ = nil
 		_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0")
 		_detalhes.build_counter = 996 --it's 996 for release
-		_detalhes.userversion = "v3.15.1"
+		_detalhes.userversion = "v3.15.1a"
 		_detalhes.realversion = 69 --core version
 		_detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")"
 		Details = _detalhes
diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua
index 722f5b83..3bd8b46e 100644
--- a/classes/classe_damage.lua
+++ b/classes/classe_damage.lua
@@ -3675,6 +3675,7 @@ end
 					shadow.classe = actor.classe
 					shadow.spec = actor.spec
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.isTank = actor.isTank
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
@@ -3735,6 +3736,7 @@ end
 					shadow.spec = actor.spec
 					shadow.isTank = actor.isTank
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
 					shadow.fight_component = actor.fight_component
diff --git a/classes/classe_energy.lua b/classes/classe_energy.lua
index 0967aea6..0a078be7 100644
--- a/classes/classe_energy.lua
+++ b/classes/classe_energy.lua
@@ -1452,6 +1452,7 @@ end
 					shadow.classe = actor.classe
 					shadow.spec = actor.spec
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.isTank = actor.isTank
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
@@ -1497,6 +1498,7 @@ end
 					shadow.classe = actor.classe
 					shadow.spec = actor.spec
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.isTank = actor.isTank
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
diff --git a/classes/classe_heal.lua b/classes/classe_heal.lua
index 15afb255..d82a48d1 100644
--- a/classes/classe_heal.lua
+++ b/classes/classe_heal.lua
@@ -2154,6 +2154,7 @@ end
 					shadow.classe = actor.classe
 					shadow.spec = actor.spec
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.isTank = actor.isTank
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
@@ -2216,6 +2217,7 @@ end
 					shadow.classe = actor.classe
 					shadow.spec = actor.spec
 					shadow.grupo = actor.grupo
+					shadow.pvp = actor.pvp
 					shadow.isTank = actor.isTank
 					shadow.boss = actor.boss
 					shadow.boss_fight_component = actor.boss_fight_component
diff --git a/classes/classe_others.lua b/classes/classe_others.lua
index 47ce88bf..ddd34885 100644
--- a/classes/classe_others.lua
+++ b/classes/classe_others.lua
@@ -2375,6 +2375,7 @@ function atributo_misc:r_onlyrefresh_shadow (actor)
 		shadow.classe = actor.classe
 		shadow.spec = actor.spec
 		shadow.grupo = actor.grupo
+		shadow.pvp = actor.pvp
 		shadow.isTank = actor.isTank
 		shadow.boss = actor.boss
 		shadow.boss_fight_component = actor.boss_fight_component
@@ -2501,6 +2502,7 @@ function atributo_misc:r_connect_shadow (actor, no_refresh)
 		shadow.classe = actor.classe
 		shadow.spec = actor.spec
 		shadow.grupo = actor.grupo
+		shadow.pvp = actor.pvp
 		shadow.isTank = actor.isTank
 		shadow.boss = actor.boss
 		shadow.boss_fight_component = actor.boss_fight_component
diff --git a/classes/container_combatentes.lua b/classes/container_combatentes.lua
index 80f19ea3..0e52f6b6 100644
--- a/classes/container_combatentes.lua
+++ b/classes/container_combatentes.lua
@@ -185,7 +185,7 @@
 						novo_objeto.isTank = true
 					end
 				else
-					if (_detalhes.pvp_as_group and _detalhes.tabela_vigente.is_pvp and _detalhes.is_in_battleground) then
+					if (_detalhes.pvp_as_group and (_detalhes.tabela_vigente and _detalhes.tabela_vigente.is_pvp) and _detalhes.is_in_battleground) then
 						novo_objeto.grupo = true
 					end
 				end