Fix static function