diff --git a/includes/core/class-permalinks.php b/includes/core/class-permalinks.php
index 56e27224..d2bb240e 100644
--- a/includes/core/class-permalinks.php
+++ b/includes/core/class-permalinks.php
@@ -130,6 +130,11 @@ if ( ! class_exists( 'um\core\Permalinks' ) ) {
 		 * @return mixed|void
 		 */
 		function get_current_url( $no_query_params = false ) {
+			/*
+			 * future fix
+			 * global $wp;
+			echo home_url( $wp->request );
+			*/
 			$server_name_method = UM()->options()->get( 'current_url_method' );
 			$server_name_method = ! empty( $server_name_method ) ? $server_name_method : 'SERVER_NAME';
 
diff --git a/ultimate-member.php b/ultimate-member.php
index eb040a25..4e0d15a7 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.0.17
+Version: 2.0.18-alpha1
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member