Fix on Sol9