Rewrite fix one more time