fix subkey case as well