diff --git a/.mailmap b/.mailmap
index eeafcc6fa..f51476829 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Isaac Z. Schlueter <i@izs.me>
 Ismail Khair <ismail.khair@gmail.com>
 James Burke <jrburke@gmail.com>
 James Padolsey <cla@padolsey.net> <jamespadolsey@gmail.com>
+Jason Bedard <jason+jquery@jbedard.ca> <github@jbedard.ca>
 Jay Merrifield <fracmak@gmail.com>
 Jay Merrifield <fracmak@gmail.com> <jmerrifiel@gannett.com>
 Jean Boussier <jean.boussier@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 9ce13edf2..580570fb2 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -167,3 +167,4 @@ Michał Gołębiowski <m.goleb@gmail.com>
 Steven Benner <admin@stevenbenner.com>
 Li Xudong <istonelee@gmail.com>
 Renato Oliveira dos Santos <ros3@cin.ufpe.br>
+Jason Bedard <jason+jquery@jbedard.ca>
diff --git a/src/attributes.js b/src/attributes.js
index 6cefd52ac..ace917e91 100644
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -182,15 +182,14 @@ jQuery.fn.extend({
 		isFunction = jQuery.isFunction( value );
 
 		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
+			var val;
 
 			if ( this.nodeType !== 1 ) {
 				return;
 			}
 
 			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
+				val = value.call( this, i, jQuery( this ).val() );
 			} else {
 				val = value;
 			}