Yet another attempt to fix crd wpm