issue #31 typos in the rewrite