Ran Biron

Thanks, this seem to work well with my test class. Wouldn't that mode be a more sensible default, given the critical nature of the bug?