diff --git a/play-framework/student-api/app/models/StudentStore.java b/play-framework/student-api/app/models/StudentStore.java
index e665de399a..1ebc14ffab 100644
--- a/play-framework/student-api/app/models/StudentStore.java
+++ b/play-framework/student-api/app/models/StudentStore.java
@@ -1,7 +1,7 @@
 package models;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -27,7 +27,7 @@ public class StudentStore {
     }
 
     public Set<Student> getAllStudents() {
-        return (Set<Student>)students.values();
+        return new HashSet<>(students.values());
     }
 
     public Student updateStudent(Student student) {