diff --git a/src/magic/model/MagicGame.java b/src/magic/model/MagicGame.java
index f2b548bf8e..91968ad145 100644
--- a/src/magic/model/MagicGame.java
+++ b/src/magic/model/MagicGame.java
@@ -214,17 +214,17 @@ public class MagicGame {
 		return score;
 	}
 
+    /*
     public long getTime() {
         return time;
     }
 
-    /*
     public void setTime(final long t) {
         time = t;
     }
     */
 
-    public long incTime() {
+    public long getUniqueId() {
         time++;
         return time;
     }
@@ -243,7 +243,7 @@ public class MagicGame {
             getPayedCost().getX(),
             stack.getItemsId(),
             events.getEventsId(),
-            time,
+            //time,
             //identifiers[0],
             //identifiers[1],
             //identifiers[2],
@@ -768,7 +768,7 @@ public class MagicGame {
 	}
 						
 	public MagicPermanent createPermanent(final MagicCard card,final MagicPlayer controller) {
-		return new MagicPermanent(incTime(),card,controller);
+		return new MagicPermanent(getUniqueId(),card,controller);
 	}
 	
 	public MagicCardList getExiledUntilEndOfTurn() {
@@ -1050,8 +1050,7 @@ public class MagicGame {
 	}
 	
 	public MagicPermanentTrigger addTrigger(final MagicPermanent permanent,final MagicTrigger trigger) {
-		final long id=incTime();
-		final MagicPermanentTrigger permanentTrigger=new MagicPermanentTrigger(id,permanent,trigger);
+		final MagicPermanentTrigger permanentTrigger=new MagicPermanentTrigger(getUniqueId(),permanent,trigger);
 		triggers.get(trigger.getType()).add(permanentTrigger);
 		return permanentTrigger;
 	}
diff --git a/src/magic/model/MagicPlayer.java b/src/magic/model/MagicPlayer.java
index 4d9c639616..21e89fdc90 100644
--- a/src/magic/model/MagicPlayer.java
+++ b/src/magic/model/MagicPlayer.java
@@ -272,7 +272,7 @@ public class MagicPlayer implements MagicTarget {
 
 	public void createHandAndLibrary(final int handSize) {
 		for (final MagicCardDefinition cardDefinition : playerDefinition.getDeck()) {
-            final long id = MagicGame.getInstance().incTime();
+            final long id = MagicGame.getInstance().getUniqueId();
 			library.add(new MagicCard(cardDefinition,this,id));
 		}
 
diff --git a/src/magic/model/action/MagicCopyCardOnStackAction.java b/src/magic/model/action/MagicCopyCardOnStackAction.java
index a39269db57..6a40e6ee72 100644
--- a/src/magic/model/action/MagicCopyCardOnStackAction.java
+++ b/src/magic/model/action/MagicCopyCardOnStackAction.java
@@ -19,8 +19,7 @@ public class MagicCopyCardOnStackAction extends MagicAction {
 	@Override
 	public void doAction(final MagicGame game) {
 		final MagicCardOnStack copyCardOnStack=cardOnStack.copyCardOnStack(player);
-		final long id=game.incTime();
-		copyCardOnStack.setId(id);
+		copyCardOnStack.setId(game.getUniqueId());
 		game.getStack().addToTop(copyCardOnStack);
 		if (copyCardOnStack.getEvent().getTargetChoice() != MagicTargetChoice.NONE) {
 			copyCardOnStack.getChoiceResults()[0]=null;
diff --git a/src/magic/model/action/MagicPutItemOnStackAction.java b/src/magic/model/action/MagicPutItemOnStackAction.java
index 502a873944..f6b5adae60 100644
--- a/src/magic/model/action/MagicPutItemOnStackAction.java
+++ b/src/magic/model/action/MagicPutItemOnStackAction.java
@@ -16,8 +16,7 @@ public class MagicPutItemOnStackAction extends MagicAction {
 	
 	@Override
 	public void doAction(final MagicGame game) {
-		final long id=game.incTime();
-		itemOnStack.setId(id);
+		itemOnStack.setId(game.getUniqueId());
 		game.getStack().addToTop(itemOnStack);
 		if (itemOnStack.hasChoices()) {
 			game.addEvent(new MagicStackGetChoicesEvent(itemOnStack));