Adds missing code from last commit