SOPE backport