Fix part of last commit