Fix missing key return