Yet another recursive keys bug fix