diff --git a/src/Staq/Application.php b/src/Staq/Application.php
index <HASH>..<HASH> 100644
--- a/src/Staq/Application.php
+++ b/src/Staq/Application.php
@@ -12,7 +12,7 @@ abstract class Application {
 	/*************************************************************************
 	  STATIC SHORTHAND METHODS                 
 	 *************************************************************************/
-	public static function create( $path = 'Staq\Core\Ground', $baseUri = NULL, $platform = 'prod' ) {
+	public static function create( $path = 'Staq\Core\Ground', $baseUri = NULL, $platform = NULL ) {
 		return ( new \Staq\Server )->createApplication( $path, $baseUri, $platform );
 	}
 }
diff --git a/src/Staq/Server.php b/src/Staq/Server.php
index <HASH>..<HASH> 100644
--- a/src/Staq/Server.php
+++ b/src/Staq/Server.php
@@ -65,6 +65,7 @@ class Server {
 		}
 		if ( empty( $platform ) ) {
 			if ( PHP_SAPI == 'cli' ) {
+				global $argv;
 				if ( ! isset( $argv[ 1 ] ) ) {
 					echo 'You must specify a platform.' . PHP_EOL;
 					echo 'Ex: ' . $argv[ 0 ] . ' local' . PHP_EOL;
BugFix on cli platform management