ERP-130 - another attempt to fix the spec.