Rewrite fix