This appears to solve the issue I've been running into. Abdu's trace is different though, so there might be another, similar, problem left to fix.