Fixed a bug with bad 'this'