fixed an issue with keys