this damn bug is pretty lame
scripted update of code from master at 8b5da3a this damn bug is pretty lame