export MakeCallback with env argument
rebase fix for windows