--- Slim/Buttons/Common.pm	2006-08-26 18:18:00.000000000 -0700
+++ server/Slim/Buttons/Common.pm	2006-08-29 10:47:08.594000000 -0700
@@ -172,7 +172,7 @@ in Slim::Web::Setup and Slim::Buttons::S
 =cut
 
 sub hash_of_savers {
-	return \%savers;
+	return %savers;
 }
 
 =head2 addMode ( )
--- Slim/Web/Setup.pm	2006-08-24 01:11:00.000000000 -0700
+++ server/Slim/Web/Setup.pm	2006-08-29 10:37:37.859625000 -0700
@@ -126,7 +126,9 @@ sub initSetupConfig {
 						if ($client->display->isa('Slim::Display::Transporter')) {
 							push @{$pageref->{'GroupOrder'}}, 'Visual';
 						}
-						if (scalar(keys %{Slim::Buttons::Common::hash_of_savers()}) > 0) {
+						
+						my %savers = Slim::Buttons::Common::hash_of_savers;
+						if (scalar(keys %savers) > 0) {
 							push @{$pageref->{'GroupOrder'}}, 'ScreenSaver';
 						}
 					} else {
@@ -269,21 +271,21 @@ sub initSetupConfig {
 						}
 			,'screensaver'	=> {
 							'validate' => \&Slim::Utils::Validate::inHash
-							,'validateArgs' => [\&Slim::Buttons::Common::hash_of_savers,1]
+							,'validateArgs' => [sub {return Slim::Buttons::Common::hash_of_savers;},1]
 							,'optionSort' => 'V'
-							,'options' => \&Slim::Buttons::Common::hash_of_savers
+							,'options' => sub {return {Slim::Buttons::Common::hash_of_savers};}
 						}
 			,'idlesaver'	=> {
 							'validate' => \&Slim::Utils::Validate::inHash
-							,'validateArgs' => [\&Slim::Buttons::Common::hash_of_savers,1]
+							,'validateArgs' => [sub {return Slim::Buttons::Common::hash_of_savers;},1]
 							,'optionSort' => 'V'
-							,'options' => \&Slim::Buttons::Common::hash_of_savers
+							,'options' => sub {return {Slim::Buttons::Common::hash_of_savers};}
 						}
 			,'offsaver'	=> {
 							'validate' => \&Slim::Utils::Validate::inHash
-							,'validateArgs' => [\&Slim::Buttons::Common::hash_of_savers,1]
+							,'validateArgs' => [sub {return Slim::Buttons::Common::hash_of_savers;},1]
 							,'optionSort' => 'V'
-							,'options' => \&Slim::Buttons::Common::hash_of_savers
+							,'options' => sub {return {Slim::Buttons::Common::hash_of_savers};}
 						}
 			,'screensavertimeout' => {
 							'validate' => \&Slim::Utils::Validate::number
--- Slim/Buttons/Settings.pm	2006-08-28 05:01:00.000000000 -0700
+++ server/Slim/Buttons/Settings.pm	2006-08-29 10:46:24.469000000 -0700
@@ -447,7 +447,7 @@ sub executeCommand {
 sub screensaverInit {
 	my $client = shift;
 	
-	my %hash  = %{&Slim::Buttons::Common::hash_of_savers};
+	my %hash  = Slim::Buttons::Common::hash_of_savers;
 	my @savers;
 	
 	for (sort keys %hash) {