diff --git a/src/Context/TqContext.php b/src/Context/TqContext.php
index <HASH>..<HASH> 100644
--- a/src/Context/TqContext.php
+++ b/src/Context/TqContext.php
@@ -131,7 +131,7 @@ class TqContext extends RawTqContext
     }
 
     /**
-     * @Then /^I checkout to whole page$/
+     * @Then /^(?:|I )checkout to whole page$/
      */
     public function unsetWorkingElementScope()
     {
@@ -233,7 +233,7 @@ class TqContext extends RawTqContext
     public function beforeStep(Scope\BeforeStepScope $step = null)
     {
         if (null !== $step) {
-            $this->pageUrl = $this->getCurrentUrl();
+            self::$pageUrl = $this->getCurrentUrl();
         }
     }
Added usage of RawTqContext::$pageUrl inside of TqContext