An attempt to fix the dec_fir problem in an easy way. We could do better, but this is clean and I think solves our problem for now.