hopefully this fixes
scripted update of code from master at d9e9e0c hopefully this fixes