diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java
index 7fff4775f5..0f48e7b5fe 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/AngelOfJubilation.java
@@ -27,7 +27,7 @@
  */
 package mage.sets.avacynrestored;
 
-import mage.constants.*;
+import java.util.UUID;
 import mage.MageInt;
 import mage.ObjectColor;
 import mage.abilities.Ability;
@@ -36,14 +36,19 @@ import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Layer;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.SubLayer;
+import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  * @author noxx
  */
diff --git a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
index 165b92dbc3..809701256f 100644
--- a/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
+++ b/Mage.Sets/src/mage/sets/innistrad/LaboratoryManiac.java
@@ -109,7 +109,10 @@ class LaboratoryManiacEffect extends ReplacementEffectImpl<LaboratoryManiacEffec
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getType() == EventType.LOSES && event.getPlayerId().equals(source.getControllerId())) {
             Player player = game.getPlayer(event.getPlayerId());
-              if (!player.hasLost() && (player.getLife() > 0 && player.isEmptyDraw() && player.getCounters().getCount(CounterType.POISON) < 10)) {
+              if (!player.hasLost() && (
+                        (player.getLife() > 0 || !player.canLoseByZeroOrLessLife())
+                      && player.isEmptyDraw()
+                      && player.getCounters().getCount(CounterType.POISON) < 10)) {
                 return true;
             }
         }