BUGFIX: Commit repair