Currently I think the code will apply the wrong pfb shape in this case. @ldress has the correct code, we just need to get it in.
