D0 term seems to work now - thanks @panmari for helping me with the stupid handwork and the allowance to steal his tests B-)