oooof thats a painful mistake
scripted update of code from master at cc21f32 oooof thats a painful mistake