Fixing improper this reference