diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index b0a4bb0b1..f07fb8e6c 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -147,8 +147,8 @@ Returns a WebGUI::Session::DateTime object.
 
 sub datetime {
 	my $self = shift;
-	if (exists $self->{_datetime}) {
-		$self->{_datetime} = WebGUI::Session::DateTime->new($self->session);
+	unless (exists $self->{_datetime}) {
+		$self->{_datetime} = WebGUI::Session::DateTime->new($self);
 	}
 	return $self->{_datetime};
 }
diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm
index 505c21615..428173cc4 100644
--- a/lib/WebGUI/Session/DateTime.pm
+++ b/lib/WebGUI/Session/DateTime.pm
@@ -726,8 +726,7 @@ Returns an epoch date for now.
 =cut
 
 sub time {
-	my $self = shift;
-	return $self->session->datetime->time();
+	return time();
 }
 
 #-------------------------------------------------------------------