Removed rewrite bug