see if this works
scripted update of code from master at dffc5f9 see if this works