partial workaround 10694