Fixed: Getting the wrong key