diff --git a/ChangeLog b/ChangeLog
index 185018fd0..38edda6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-31  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	Bug #943 - Signals are only emitted within a certain area of
+	           the stage
+
+	* clutter/clutter-main.c (clutter_do_event): Use the proper
+	API and not the macros for the default stage, in case we are
+	using a backend supporting multiple stages. (Julian Aron Prenner)
+
 2008-05-30  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/pango/pangoclutter-fontmap.c:
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 0c8789daf..ab5d23d73 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -1705,8 +1705,8 @@ clutter_do_event (ClutterEvent *event)
           if (event->any.source == NULL)
             {
               /* Handle release off stage */
-              if ((x >= CLUTTER_STAGE_WIDTH () ||
-                   y >= CLUTTER_STAGE_HEIGHT() ||
+              if ((x >= clutter_actor_get_width (stage) ||
+                   y >= clutter_actor_get_height (stage) ||
                    x < 0 || y < 0))
                 {
                   if (event->type == CLUTTER_BUTTON_RELEASE)