Fix rewrite 2.0