fixed closure thiscall, added test case