Added missing changes for last commit