Added missing changes from last commit