diff --git a/class-wp.php b/class-wp.php
index dfc2f97..92e8036 100755
--- a/class-wp.php
+++ b/class-wp.php
@@ -593,8 +593,11 @@ class WP {
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ( $wp_query->is_author() ){
+			if( isset( $wp_query->post ) )
+				$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+			else
+				$GLOBALS['authordata'] = get_userdata( get_queried_object()->ID );
 		}
 	}