a fix
scripted update of code from master at 290eb12 a fix