diff --git a/templates/chrony.conf.erb b/templates/chrony.conf.erb
index af34c11..ebe1070 100644
--- a/templates/chrony.conf.erb
+++ b/templates/chrony.conf.erb
@@ -4,14 +4,13 @@
 ###    original chrony.conf file can be found at https://3for.me/2t0an       ### 
 ################################################################################
 
-<%  if @cy_server_fqdn == $fqdn -%>
+<%  if @fqdn == @cy_server_fqdn -%>
 # This is a time server configuration file
 <% @cy_conf_servers.each do |this_server| -%>
 pool <%= this_server %> iburst
-<% end -%>
-<% else -%>
-# This is a time client configuration file
-<% @cy_server_fqdn.each do |this_server| -%>
-server <%= this_server %> iburst
-<% end end -%>
 
+<% end -%>
+
+<% if @fqdn != @cy_server_fqdn -%>
+# This is a time client configuration file
+<% end -%>