Rewrite fix attempt.