Fixing corner case on domain keystore