Rewrite fixed