Fixed serious issue with 'this' context