Not part of the fix, but it would be nice if you could change "self" to "this" in this comment. Someone accidentally changed it to self XD.