Add missing code from last commit