Were you able to fix this issue? I’m having the same (on 16.2)