Commit the correct code from last commit