Fixed missing changes for last commit