diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
index a923b7652bd14d26b55835224e82b793f6932890..62bf430e9434ae887724e9631afaeeb0c67b0607 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
@@ -81,7 +81,7 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
     @Override
     public List<Visit> findByPetId(Integer petId) {
         return this.jdbcTemplate.query(
-                "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
+                "SELECT id, visit_date, description FROM visits WHERE pet_id=?",
                 new JdbcVisitRowMapper(), petId);
     }
 
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java
index d6dd0cbf8bd3f506c5c7a4b9679f20387e5d5e3a..0577182e3c4ce01c49a38daba75cd6757595b1de 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java
@@ -33,7 +33,7 @@ class JdbcVisitRowMapper implements RowMapper<Visit> {
     @Override
     public Visit mapRow(ResultSet rs, int row) throws SQLException {
         Visit visit = new Visit();
-        visit.setId(rs.getInt("visits.id"));
+        visit.setId(rs.getInt("id"));
         Date visitDate = rs.getDate("visit_date");
         visit.setDate(new DateTime(visitDate));
         visit.setDescription(rs.getString("description"));