Undo the last commit and fix the actual problem