Commmit before rewrite