diff --git a/laravel/config/container.php b/laravel/config/container.php
index 8e0b3184..5d91f395 100644
--- a/laravel/config/container.php
+++ b/laravel/config/container.php
@@ -221,11 +221,11 @@
 
 	'laravel.session.cookie' => array('resolver' => function($container)
 	{
-		$cookies = $container->resolve('laravel.request')->input->cookies;
+		$cookies = $container->resolve('laravel.cookie');
 
 		$config = $container->resolve('laravel.config')->get('session');
 
-		return new Session\Drivers\Cookie(Security\Crypter::make(), $cookies);
+		return new Session\Drivers\Cookie($container->resolve('laravel.crypter'), $cookies);
 	}),
 
 	/*
@@ -238,7 +238,7 @@
 	{
 		$table = $container->resolve('laravel.config')->get('session.table');
 
-		return new Session\Drivers\Database($container->resolve('laravel.database.manager')->connection());
+		return new Session\Drivers\Database($container->resolve('laravel.database')->connection());
 	}),
 
 	/*
diff --git a/tests/Session/SessionResolverTest.php b/tests/Session/SessionResolverTest.php
new file mode 100644
index 00000000..1440eef5
--- /dev/null
+++ b/tests/Session/SessionResolverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+class SessionResolverTest extends PHPUnit_Framework_TestCase {
+
+	public function testDriversCanBeResolved()
+	{
+		IoC::resolve('laravel.config')->set('application.key', 'something');
+
+		$this->assertInstanceOf('Laravel\\Session\\Manager', IoC::resolve('laravel.session.manager'));
+		$this->assertInstanceOf('Laravel\\Session\\Drivers\\APC', IoC::resolve('laravel.session.apc'));
+		$this->assertInstanceOf('Laravel\\Session\\Drivers\\Cookie', IoC::resolve('laravel.session.cookie'));
+		$this->assertInstanceOf('Laravel\\Session\\Drivers\\Database', IoC::resolve('laravel.session.database'));
+		$this->assertInstanceOf('Laravel\\Session\\Drivers\\File', IoC::resolve('laravel.session.file'));
+		$this->assertInstanceOf('Laravel\\Session\\Drivers\\Memcached', IoC::resolve('laravel.session.memcached'));
+	}
+
+}
\ No newline at end of file