Correct code from last commit