Bugfix: Added missing function and missing file.