ported ERRATA 657451