diff --git a/src/main/java/guru/springframework/Money.java b/src/main/java/guru/springframework/Money.java
index cac853a7..8121fb87 100644
--- a/src/main/java/guru/springframework/Money.java
+++ b/src/main/java/guru/springframework/Money.java
@@ -8,8 +8,8 @@ public class Money {
     protected int amount;
 
     public boolean equals(Object object) {
-        // Manual equals, left like this as equals with null or other class will be done later
+        // Manual equals, left like this as equals with null will be done later
         Money money = (Money) object;
-        return amount == money.amount;
+        return amount == money.amount && getClass().equals(object.getClass());
     }
 }
diff --git a/src/test/java/guru/springframework/MoneyTest.java b/src/test/java/guru/springframework/MoneyTest.java
index d068cd00..f521d158 100644
--- a/src/test/java/guru/springframework/MoneyTest.java
+++ b/src/test/java/guru/springframework/MoneyTest.java
@@ -18,6 +18,8 @@ void testMultiplication() {
         assertEquals(new Dollar(10), product);
         product = five.times(3);
         assertEquals(new Dollar(15), product);
+        // Dollars dont equal francs!
+        assertNotEquals(new Dollar(5), new Franc(5));
     }
 
     @Test