Fixed another small problem with keys