Rewrite Bug Fixed