Add missing function from master