I found the issue I was seeing, have committed a fix. Can you check if this solves your problem @dr.fornax ?