Fixed oversight with new key logic.