Fixing the 'this' issue