diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
index 6cc4930b18f..fc7cf596828 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
@@ -334,8 +334,7 @@ private Map<Integer, Object> selectCustomQuestionAnswers(Long dataverseId, Long
                 + "and o.owner_id = " + dataverseId;
                 
         if (guestbookId != null) {
-            // FIXME: add space before "and".
-            cqString += ( "and g.guestbook_id = " + guestbookId);
+            cqString += ( " and g.guestbook_id = " + guestbookId);
         }
         
         if (firstResponse != null) {