Debugging, found the issue and implemented an untested fix.