Fixed static to non-static function