diff --git a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
index b4592a4afc1..9cf93ef570c 100644
--- a/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
+++ b/modules/swagger-generator/src/main/java/com/wordnik/swagger/generator/resource/SwaggerResource.java
@@ -37,7 +37,7 @@ public class SwaggerResource {
   @Produces({MediaType.APPLICATION_OCTET_STREAM})
   @ApiOperation(value = "Downloads a pre-generated file",
     response = String.class,
-    tags = {@Tag(value = "clients"), @Tag(value = "servers")})
+    tags = {"clients", "servers"})
   public Response downloadFile(@PathParam("fileId") String fileId) throws Exception {
     Generated g = fileMap.get(fileId);
     System.out.println("looking for fileId " + fileId);
@@ -61,7 +61,7 @@ public class SwaggerResource {
   @ApiOperation(
     value = "Generates a client library based on the config",
     response = ResponseCode.class,
-    tags = {@Tag(value = "clients", description = "client operations")})
+    tags = "clients")
   public Response generateClient(
     @ApiParam(value = "The target language for the client library", allowableValues = "android,java,php,objc,docs", required = true) @PathParam("language") String language,
     @ApiParam(value = "Configuration for building the client library", required = true) GeneratorInput opts) throws Exception {
@@ -88,7 +88,7 @@ public class SwaggerResource {
   @ApiOperation(value = "Gets languages supported by the client generator",
     response = String.class,
     responseContainer = "List",
-    tags = {@Tag(value = "clients", description = "client operations")})
+    tags = "clients")
   public Response clientOptions() {
     String[] languages = new String[clients.size()];
     languages = clients.toArray(languages);
@@ -100,7 +100,7 @@ public class SwaggerResource {
   @ApiOperation(value = "Gets languages supported by the server generator",
     response = String.class,
     responseContainer = "List",
-    tags = {@Tag(value = "servers", description = "server operations")})
+    tags = "servers")
   public Response serverOptions() {
     String[] languages = new String[servers.size()];
     languages = servers.toArray(languages);
@@ -111,7 +111,7 @@ public class SwaggerResource {
   @Path("/servers/{framework}")
   @ApiOperation(value = "Generates a server library for the supplied server framework",
     response = ResponseCode.class,
-    tags = {@Tag(value = "servers", description = "server operations")})
+    tags = "servers")
   public Response generateServerForLanguage(
     @ApiParam(value = "framework", allowableValues = "jaxrs,nodejs", required = true) @PathParam("framework") String framework,
     @ApiParam(value = "parameters", required = true) GeneratorInput opts)