Good catch. Will add a similar workaround.