Bugfix: Restore static function definition