Making the offline feature stable