re-applied a fix that was in 1.0 and not in 1.1