patched dojo for #17164