Tentative workaround for keys with '.'