diff --git a/src/cloud/ec2/lib/ebs.rb b/src/cloud/ec2/lib/ebs.rb
index d7c4afd69e..5b68fa8393 100644
--- a/src/cloud/ec2/lib/ebs.rb
+++ b/src/cloud/ec2/lib/ebs.rb
@@ -241,7 +241,7 @@ module EBS
     #
     # @param [Hash] params
     # @option params [String] VolumeId The ID of the Amazon EBS volume.
-    # @option params [Description] A description for the snapshot.
+    # @option params [String] Description A description for the snapshot.
     def create_snapshot(params)
         image_id = params['VolumeId']
         image_id = image_id.split('-')[1]
@@ -296,6 +296,9 @@ module EBS
             return rc
         end
 
+        snapshot.delete_element("TEMPLATE/EBS_VOLUME")
+        snapshot.update
+
         erb_version = params['Version']
 
         response = ERB.new(File.read(@config[:views]+"/create_snapshot.erb"))