fix WP MSP regression from #6612, again