diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java
index fa2939cc50c..b0088bfe0f4 100644
--- a/Mage/src/mage/game/stack/Spell.java
+++ b/Mage/src/mage/game/stack/Spell.java
@@ -611,7 +611,10 @@ public class Spell implements StackObject, Card {
      */
     @Override
     public int getConvertedManaCost() {
-        int cmc = 0;        
+        int cmc = 0;
+        if (this.isMorphCard() && this.isFaceDown()) {
+            return 0;
+        }
         for (Ability spellAbility: spellAbilities) {
             int xMultiplier = 0;
             for (String symbolString :spellAbility.getManaCosts().getSymbols()) {
diff --git a/Mage/src/mage/players/Library.java b/Mage/src/mage/players/Library.java
index 1d894228e14..5b878648f7d 100644
--- a/Mage/src/mage/players/Library.java
+++ b/Mage/src/mage/players/Library.java
@@ -176,7 +176,7 @@ public class Library implements Serializable {
     }
 
     public List<Card> getCards(Game game) {
-        List<Card> cards = new ArrayList<Card>();
+        List<Card> cards = new ArrayList<>();
         for (UUID cardId: library) {
             cards.add(game.getCard(cardId));
         }
@@ -184,7 +184,7 @@ public class Library implements Serializable {
     }
 
     public List<Card> getTopCards(Game game, int amount) {
-        List<Card> cards = new ArrayList<Card>();
+        List<Card> cards = new ArrayList<>();
         Iterator<UUID> it = library.iterator();
         int count = 0;
         while(it.hasNext() && count < amount) {
@@ -199,7 +199,7 @@ public class Library implements Serializable {
     }
 
     public Collection<Card> getUniqueCards(Game game) {
-        Map<String, Card> cards = new HashMap<String, Card>();
+        Map<String, Card> cards = new HashMap<>();
         for (UUID cardId: library) {
             Card card = game.getCard(cardId);
             if (!cards.containsKey(card.getName())) {