diff --git a/code/extensions/SiteTreeContentReview.php b/code/extensions/SiteTreeContentReview.php
index fa2eaba..76ca1db 100644
--- a/code/extensions/SiteTreeContentReview.php
+++ b/code/extensions/SiteTreeContentReview.php
@@ -62,7 +62,6 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
 	
 	/**
 	 * 
-	 * @param DataObject $options
 	 * @param SiteTree $page
 	 * @return Date | false - returns false if the content review have disabled
 	 */
@@ -311,17 +310,14 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
 	 * @return bool - returns true if date was set and false is content review is 'off'
 	 */
 	public function advanceReviewDate() {
-		$hasNextReview = true;
-		if($this->owner->ReviewPeriodDays) {
-			$this->owner->NextReviewDate = date('Y-m-d', strtotime('+' . $this->owner->ReviewPeriodDays . ' days'));
-		} else {
-			
-			$hasNextReview = false;
-			$this->owner->NextReviewDate = null;
+		$options = $this->getOptions();
+		$nextDate = false;
+		if($options && $options->ReviewPeriodDays) {
+			$nextDate = date('Y-m-d', strtotime('+ '.$options->ReviewPeriodDays.' days', SS_Datetime::now()->format('U')));
 		}
-		
+		$this->owner->NextReviewDate = $nextDate;
 		$this->owner->write();
-		return $hasNextReview;
+		return (bool)$nextDate;
 	}
 	
 	/**
diff --git a/tests/ContentReviewTest.yml b/tests/ContentReviewTest.yml
index 37e035c..3ed6ab0 100644
--- a/tests/ContentReviewTest.yml
+++ b/tests/ContentReviewTest.yml
@@ -20,7 +20,6 @@ Group:
         Code: authorgroup
         Permissions: =>Permission.cmsmain2,=>Permission.workflowadmin2
 
-    
 Member:
     author:
         FirstName: Test
diff --git a/tests/SiteTreeContentReviewTest.php b/tests/SiteTreeContentReviewTest.php
index d8a072a..ced0a45 100644
--- a/tests/SiteTreeContentReviewTest.php
+++ b/tests/SiteTreeContentReviewTest.php
@@ -38,6 +38,7 @@ class SiteTreeContentReviewTest extends FunctionalTest {
 	
 	public function testAdvanceReviewDate10Days() {
 		$page = new Page();
+		$page->ContentReviewType = 'Custom';
 		$page->ReviewPeriodDays = 10;
 		$this->assertTrue($page->advanceReviewDate());
 		$page->write();
@@ -46,6 +47,7 @@ class SiteTreeContentReviewTest extends FunctionalTest {
 	
 	public function testAdvanceReviewDateNull() {
 		$page = new Page();
+		$page->ContentReviewType = 'Custom';
 		$page->ReviewPeriodDays = 0;
 		$this->assertFalse($page->advanceReviewDate());
 		$page->write();