hopefully this will work
scripted update of code from master at 9e897a9 hopefully this will work