Add the missing changes for last commit