Fix S3  class