Fix post-surge/post-wd