fix wrong context for 'this' and return values