Fix public function