Dev/fix closure ref frame