Fix missing key bug