hopefully this fixes
scripted update of code from master at 25fee2a hopefully this fixes