diff --git a/radicale/__init__.py b/radicale/__init__.py
index 4a9c795..b7e1a79 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -186,13 +186,13 @@ class Application(object):
 
         # Set content length
         if answer:
-            # Decode the answer for logging purposes on Python 3
-            log_answer = answer
-            if not isinstance(log_answer, str):
-                log_answer = log_answer.decode(
-                    config.get("encoding", "request"))
+            if isinstance(answer, str):
+                log_answer = answer
+            else:
+                # Decode the answer for logging purposes on Python 3
+                log_answer = answer.decode(config.get("encoding", "request"))
             log.LOGGER.debug("Response content:\n%s" % log_answer)
-            headers["Content-Length"] = "%i" % len(answer)
+            headers["Content-Length"] = str(len(answer))
 
         # Start response
         status = "%i %s" % (status, client.responses.get(status, ""))