This acts differently from the original, but is probably a bug fix.