diff --git a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java
index 66fdee1f4..98ccef1e6 100644
--- a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java
+++ b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java
@@ -65,7 +65,9 @@ public void createMovie() {
     public void updateMovie() {
         Movie m = em.createNamedQuery("Movie.findByName", Movie.class)
             .setParameter("name", "Inception")
-            .getSingleResult();
+            .setMaxResults(1)
+            .getResultList()
+            .get(0);
         m.setName("Inception2");
         em.merge(m);
         em.flush();
@@ -74,7 +76,9 @@ public void updateMovie() {
     public void deleteMovie() {
         Movie m = em.createNamedQuery("Movie.findByName", Movie.class)
             .setParameter("name", "Inception2")
-            .getSingleResult();
+            .setMaxResults(1)
+            .getResultList()
+            .get(0);
         em.remove(m);
         em.flush();
     }