fixed "this" bug