fix S820