diff --git a/res/cardsfolder/c/callous_giant.txt b/res/cardsfolder/c/callous_giant.txt
index 0e5d3be3a48..5d6a9b824db 100644
--- a/res/cardsfolder/c/callous_giant.txt
+++ b/res/cardsfolder/c/callous_giant.txt
@@ -1,8 +1,9 @@
 Name:Callous Giant
 ManaCost:4 R R
 Types:Creature Giant
-Text:If a source would deal 3 or less damage to Callous Giant, prevent that damage.
+Text:
 PT:4/4
+S:Mode$ PreventDamage | Target$ Card.Self | MaxDamage$ 3 | Description$ If a source would deal 3 or less damage to Callous Giant, prevent that damage.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/callous_giant.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/139.jpg
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 6230b1d39ad..85f6adc2aaf 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -5797,10 +5797,6 @@ public class Card extends GameEntity implements Comparable<Card> {
             if ((source.isCreature() && AllZoneUtil.isCardInPlay("Well-Laid Plans") && source.sharesColorWith(this))) {
                 return 0;
             }
-
-            if (getName().equals("Callous Giant") && restDamage <= 3) {
-                return 0;
-            }
         } //Creature end
 
         if (restDamage > 0) {
diff --git a/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java b/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java
index 62bd280f3d7..bfc75d6a67d 100644
--- a/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java
+++ b/src/main/java/forge/card/staticAbility/StaticAbility_PreventDamage.java
@@ -34,6 +34,10 @@ public class StaticAbility_PreventDamage {
             return restDamage;
         }
         
+        if(params.containsKey("MaxDamage") && Integer.parseInt(params.get("MaxDamage")) < damage) {
+            return restDamage;
+        }
+        
         // no amount means all
         if(!params.containsKey("Amount") || params.get("Amount").equals("All")) {
             return 0;