More changes missed in last commit