Fix bug where minor keys weren't handled properly