diff --git a/packages/manifest b/packages/manifest
index b9bce1d..502321a 100644
--- a/packages/manifest
+++ b/packages/manifest
@@ -253,7 +253,7 @@
 	["yawl"] = {
 		["manifestVersion"] = "1.0",
 		["package"] = "yawl",
-		["version"] = "1.7.0",
+		["version"] = "1.7.1",
 		["name"] = "Yet Another Widget Library",
 		["repo"] = "tree/master/yawl",
 		["description"] = "New version of libgui, but using libclass2 and cleaner code and interface.",
diff --git a/packages/yawl.tar b/packages/yawl.tar
index 1ed6856..af7c23d 100644
Binary files a/packages/yawl.tar and b/packages/yawl.tar differ
diff --git a/programs.cfg b/programs.cfg
index 6048c84..a0535b0 100644
--- a/programs.cfg
+++ b/programs.cfg
@@ -254,7 +254,7 @@
 		}
 	},
 	["yawl"] = {
-		version = "1.7.0",
+		version = "1.7.1",
 		name = "Yet Another Widget Library",
 		repo = "tree/master/yawl",
 		description = "New version of libgui, but using libclass2 and cleaner code and interface.",
diff --git a/yawl/lib/yawl/widget/Widget.lua b/yawl/lib/yawl/widget/Widget.lua
index dfdb325..e659e67 100644
--- a/yawl/lib/yawl/widget/Widget.lua
+++ b/yawl/lib/yawl/widget/Widget.lua
@@ -246,7 +246,7 @@ end
 function Widget:invokeCallback(eName, ...)
     if (not self:enabled()) then return end
     local callback = self:singleCallback(eName)
-    return callback(self, select(2, self:callback()), eName, ...)
+    return callback(self, select(2, self:singleCallback(eName)), eName, ...)
 end
 
 ---Check if the x,y coordinates match the Widget
diff --git a/yawl/yawl.manifest b/yawl/yawl.manifest
index e97f11e..30c2c06 100644
--- a/yawl/yawl.manifest
+++ b/yawl/yawl.manifest
@@ -1,7 +1,7 @@
 {
 	["manifestVersion"] = "1.0",
 	["package"] = "yawl",
-	["version"] = "1.7.0",
+	["version"] = "1.7.1",
 	["name"] = "Yet Another Widget Library",
 	["repo"] = "tree/master/yawl",
 	["description"] = "New version of libgui, but using libclass2 and cleaner code and interface.",