diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea254f0fd..ce7bd082c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ None.
   [JP Simard](https://github.com/jpsim)
   [#65](https://github.com/jpsim/SourceKitten/issues/65)
 
+* Fix `String.stringByTrimmingTrailingCharactersInSet(_:)` returning full string
+  when all characters matched character set.  
+  [JP Simard](https://github.com/jpsim)
+
 
 ## 0.6.2
 
diff --git a/Source/SourceKittenFramework/String+SourceKitten.swift b/Source/SourceKittenFramework/String+SourceKitten.swift
index 7cab70a91..2777fb698 100644
--- a/Source/SourceKittenFramework/String+SourceKitten.swift
+++ b/Source/SourceKittenFramework/String+SourceKitten.swift
@@ -89,7 +89,7 @@ extension NSString {
                 return substringWithRange(NSRange(location: 0, length: newLength))
             }
         }
-        return self as String
+        return ""
     }
 
     /**
diff --git a/Source/SourceKittenFrameworkTests/StringTests.swift b/Source/SourceKittenFrameworkTests/StringTests.swift
index f2fdfb7f5..1feccb34e 100644
--- a/Source/SourceKittenFrameworkTests/StringTests.swift
+++ b/Source/SourceKittenFrameworkTests/StringTests.swift
@@ -23,6 +23,8 @@ class StringTests: XCTestCase {
     func testStringByTrimmingTrailingCharactersInSet() {
         XCTAssertEqual("".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "")
         XCTAssertEqual(" a ".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), " a")
+        XCTAssertEqual(" ".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "")
+        XCTAssertEqual("a".stringByTrimmingTrailingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()), "a")
     }
 
     func testCommentBody() {