diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c
index c02875b7f..b575bff0b 100644
--- a/clutter/glx/clutter-backend-glx.c
+++ b/clutter/glx/clutter-backend-glx.c
@@ -388,22 +388,22 @@ clutter_glx_get_default_display (void)
 /**
  * clutter_glx_get_default_screen:
  * 
- * FIXME
+ * Gets the pointer to the default X Screen object.
  *
  * Return value: FIXME
  *
  * Since: 0.4
  */
-gint
+Screen *
 clutter_glx_get_default_screen (void)
 {
   if (!backend_singleton)
     {
       g_critical ("GLX backend has not been initialised");
-      return -1;
+      return NULL;
     }
 
-  return backend_singleton->xscreen_num;
+  return backend_singleton->xscreen;
 }
 
 /**
diff --git a/clutter/glx/clutter-glx.h b/clutter/glx/clutter-glx.h
index bc12e8b8f..64ceb0d15 100644
--- a/clutter/glx/clutter-glx.h
+++ b/clutter/glx/clutter-glx.h
@@ -37,7 +37,7 @@ void     clutter_glx_trap_x_errors       (void);
 gint     clutter_glx_untrap_x_errors     (void);
 
 Display *clutter_glx_get_default_display (void);
-gint     clutter_glx_get_default_screen  (void);
+Screen * clutter_glx_get_default_screen  (void);
 Window   clutter_glx_get_root_window     (void);
 
 Window       clutter_glx_get_stage_window (ClutterStage *stage);