diff --git a/lib/capistrano/configuration/server.rb b/lib/capistrano/configuration/server.rb
index 12248591..6d4a2633 100644
--- a/lib/capistrano/configuration/server.rb
+++ b/lib/capistrano/configuration/server.rb
@@ -16,7 +16,7 @@ module Capistrano
       end
 
       def roles
-        @roles ||= Set.new
+        properties.roles ||= Set.new
       end
     end
   end