Fix 'this' bug