diff --git a/Sources/Model/Dice/Die.cs b/Sources/Model/Dice/Die.cs
index 6a1534c..6a62f47 100644
--- a/Sources/Model/Dice/Die.cs
+++ b/Sources/Model/Dice/Die.cs
@@ -7,21 +7,21 @@ namespace Model.Dice
 {
     public abstract class Die
     {
-        public IEnumerable<Face> ListFaces => listFaces;
+        public IEnumerable<Face> Faces => faces;
 
         protected static readonly Random rnd = new();
 
-        private readonly List<Face> listFaces = new();
+        private readonly List<Face> faces = new();
 
         protected Die(params Face[] faces)
         {
-            listFaces.AddRange(faces);
+            this.faces.AddRange(faces);
         }
 
-        public Face GetRandomFace()
+        public virtual Face GetRandomFace()
         {
-            int faceIndex = rnd.Next(0, ListFaces.Count());
-            return ListFaces.ElementAt(faceIndex);
+            int faceIndex = rnd.Next(0, Faces.Count());
+            return Faces.ElementAt(faceIndex);
         }
     }
 }
diff --git a/Sources/Model/Dice/HomogeneousDie.cs b/Sources/Model/Dice/HomogeneousDie.cs
index 22ab110..6ccd6a9 100644
--- a/Sources/Model/Dice/HomogeneousDie.cs
+++ b/Sources/Model/Dice/HomogeneousDie.cs
@@ -7,5 +7,10 @@ namespace Model.Dice
         protected HomogeneousDie(params Face<T>[] faces) : base(faces)
         {
         }
+
+        public override Face<T> GetRandomFace()
+        {
+            return (Face<T>)base.GetRandomFace();
+        }
     }
 }