Fix Rewrite