diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cc1c89..87d487a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 
 #### [Current]
+ * [002a534](../../commit/002a534) [#17](../../issues/17) Apply encoding before setting issue links __(Murat Kemal BAYGÜN)__
  * [d1cdb61](../../commit/d1cdb61) [#17](../../issues/17) Revert breaking code __(Murat Kemal BAYGÜN)__
  * [0291a3f](../../commit/0291a3f) [#17](../../issues/17) improve gsub usage, fix double quotes __(Murat Kemal BAYGÜN)__
  * [3b25646](../../commit/3b25646) Merge pull request [#18](../../issues/18) from rderoldan1/develop __(Murat Kemal BAYGÜN)__
diff --git a/bin/katip b/bin/katip
index 45b6e47..68455ca 100755
--- a/bin/katip
+++ b/bin/katip
@@ -64,7 +64,9 @@ def parse_change_log
   output.each do |line|
     line.encode!('utf-8', invalid: :replace, undef: :replace, replace: '')
 
-    line.gsub!(/#[1-9][0-9]*/) {|s| "[#{s}](#{ISSUE_URL}#{s[-(s.length-1)..-1]})"}
+    if line.index(/#[1-9][0-9]*/)
+      line.gsub!(/#[1-9][0-9]*/) {|s| "[#{s}](#{ISSUE_URL}#{s[-(s.length-1)..-1]})"}
+    end
   end
 
   output