Correcting a 'this' issue