Committing before rebuild