your latest rewrite fixes this issue, right?