Missed some changes on last commit